Keys should not have underscores to prevent issues later.
Various cleanup.