Cleanup

Fixed #4 and did some organisation. Caffeine needed! :)