Refactoring, Cleanup, Comments

3.4.0.1