minor refactoring
version 1.0.1