Legibility Changes

Re-ordered some code for the sake of legibility