Refactored code to simplify option decorators
Simplified check for subsequent newlines