various cleanups & made table keys less cryptic