Improve indentation rules