Refactored more hard tabs