Cleaned up a little bit of project flow