More apt naming.
Removed comments.
Refactor into a more modular structure.