Clean repo

Cleaned up version of the codebase for review.