Fully commented up, and golint happy