Some Refactoring and interactive goodness