Converting tabs to spaces
Replaced index dep with listenerMethods
More documentation in code