minor design improvement
clean up
design