Clean up empty spaces