Cleaned up tab coding