Remove white space and fix other things