Changes to reflect rock coding style