clean up

Coding cleaning up