Adds comments and refactors again...
Continues our refactoring adventure...