Minor changes.

Removed repetitive metadata and cleaned up some code to be thinner.