general cleanup of code

1 job for cleanup in 1 minute and 9 seconds (queued for 1 second)