Refactored and updated the colon-space option