CODE: Minor style changes