Update comments
Fix incorrect createTab method
Remove redundant code