Some straight forward coding style changes