Cleaned project up a bit