Cleaned up everything so it's ready to be pushed to the master branch.