More refactoring and improvements - no tests yet
Removed extra readme white space