Cleanup & documentation

Making golint happy