Refactor the code according to the Code Style options