Clean the code

Apply golint's recommendations