Better comments, remove tabwrapper