Some minor changes and cleaning