ENH: Cleaner organization