Start cleaning up the project to make it a good example