Fixed instances of bad style in the code.