adds helper classes for visibility
removes some helpers