Post Hackathon Code Refactor