clean up and misc style correction: