Simple refactors for better reliability