cleaned up code for tabindex
Clean up