prefactoring
changes previous to 0.1.0