[TASK] Make use of registerArguments to improve legibility