implement service object, extract class
test cleanup
code cleanup
remove setup