Improvements and clean up