Started transition to cleaner if-statements.