Finished Warmup-2

Refactored code a little.
Got rid of some newlines.