Fixed code review comments. Mostly from Snitch.