Refactored. converted tabs