Code Review

No commented out code in master! :japanese_goblin: