Refactor selectable objects