Snake minor refactor and renaming for clarity.