Added code to remove spaces.