Final project commit

Cleaned up comments, made code more readable