Clean up code as per landscape.io