Modifications to methods to better align with Apple's recommendations

Please do not accept this PR. It is for review purposes.