improvements and clean up