More refactors for readability