Refactors for readability