Fix code style issues in previous commit