The Comment Fairy - Part 2
Refactor stuff, general cleaning.