New selectors were implemented, and the code beautified.