Refactor further after continued subclassing