cleaned up project, ready to submit