cleanup main by adding client classes