Refactored and separated concerns out
Removed unnecessary aliases for some cli options
Version Bump