Remove spaces for consistency