Update formatting to remove the code-smell that is arguments all on one line to methods; Embedding require calls to their respective methods.