minor improvements and clean up