Some code style changes, a missing break after a switch case and some clean-up. Time to leave! :)