Clean up project a bit for review