Cleaned code

1 job for ba_mann in 8 minutes and 8 seconds (queued for 2 seconds)