Modify bad coding style