Fixing code style problems