Style(selector): code cleanup