Removing more spaces to prepare for rewrite