General cleanup. Selectors are now cached, will discuss.