Cleaned up code/comments/aesthetics