more cleaning up
code simplification