Caching selectors
Code clean up
Build optimisation