Some more code review/clean up

Feel free to reject if you don't like them.