Starting cleanup according to golint recommendations