refactor (skip addClass)