Edited project properties
Cleaned up some code