Minor code housekeeping