More minor code style adjustments