Cleaned project, moved a few initialization statements