Refactors from Kodex