Update: Begin refactoring and commenting codebase