Tidy Up the project a bit