Slight refactor and renamig of methods.
Slight refactor and renamig of methods.