Removed unnecessary complexity, incorrect naming and comments from selector mixin and functions.