hid component toggle and index cleanup
spacing
Merge pull request #204 from mozilla/thursday-cleaning

Thursday cleaning