Removed some redundant fields; name cleanup.