Cleaned up code and comments

Title
.