Remove white space and add spec