v 0.0.2b beta
refactoring code