clean code + use better selector