Added the enable/disable feature
Reformated some comments