Updated Codebase
Beautified and complete update