Minor changes

Removed some unnecessary tags and cleaned up variable names to be more
readable.