Removing presenter 'h' method in favor of template

- Also made a few changes to improve the readability of a code section
Rename suggestions