Whitespace tidying and quick lager fix