Refactored old pages into archive
Cleaned up some code, comments