Fix trailing space
Fix validations to be performed