Cleaned up and standardised module.php