cleaning up the project a bit