A bit of general cleanup to make the flow a bit more clear
Oops