Cleanup empty spaces