Code climate ready :-)