Addressed golint errors