cabalize, fix if-else indentation
make package more descriptive