Clean up redis key naming and extract models