improvements and cleaning