commit 0.15b refactoring code