Coding style adjustments (as discussed yesterday)