ENH+STY: Cleaner code