Homogenized code style a bit