Re: [development] Cleaner and more consistent code.