No blank tab names now, shortened some code