organize and make clearer

1. return to enable/disable methods
2. simplify logic
3. rename things to be more clear
3. organize a little