Basic cleanup of your code - View it on GitHub