refactoring - version 0.4.1