formatting and cleanup
old changes