CLEANUP: Moved white space normalization to user managment