Re-organizing steps to make it more clear which ones were the refactored cleaner steps.