Removed clutter and standardised coding style.