minor changes and cleaning