Added help option, refactored/fixed formatting