Resolved issue:647, Remove white space and tabs as suggested by trivia