Additional refactors per review