cleanup according to golint and best practices