Minor code niceness changes