Major update and cleaning