Move functions around for easier understanding

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jacinta-stacks