finished all excercises of week2 (and refactored a few)