requesetiong Full refactor suggestions

Spacing looks weird, but I know that's probably just how GitHub is rendering it. Make sure the `=` signs align.