[done] - though I left double empty lines to seperate classes from each other, for the sake of readability ;)