Refactored hard tabs