cleaned the code Fixes #26