Conditions Assignment: Personal

Another rearrangement of the conditional statements