Code consistency tweaks