some changes and cleaning