Simplify some code

Use safe navigation operator and argument shorthands.