Fixed some more CS/Code remarks from PR