fixed remwarks and cleanup
fix indent