REF/ENH: Update conditionals, start to rewrite section on classes