Remove cgi_version from Build; correct indentation; minimise no critic