fix conditionals & space