Conforming to golint and formatting