A bit of reformatting to match my current coding style