Update to get/getSafe/getUnsafe naming scheme
Cosmetic, make indentation consistent