Better commenting
Fix Golint error