Refactoring: Removing highline & cleanup output
Fixing help and more refactoring