Code style/consistency updates