More minor code adjustments

More minor code adjustments