more cleaning, refactoring.etc