Cleans up code and repo a bit