Further Codestyle adjustments

Just spacing fixes