Cleaning up comments and updating TODO
Cleaning up comments
Cleaning up comments
Adding placeholder selectors
Changing setting name