Finished, time to clean it before submitting

Approx 2 hours left for the deadline