Fixed jinja2 templating to look cleaner.
Cleaned up JSON RPC based on HW#4 solutions