King - couple of renames for improved readability and simpler data structure