Following WP coding standards regarding spaces again