minor fixes and cleaning
minor cleaning