Refactoring
and more refactoring from Jan 30