Cleaned up project, added some comments