Cleaned up the source a bit

Did a quick runthrough of the comments before publishing.