Fix code style problems