Pre-work clean-up

heredoc, indentation, preparing for JS-rewrite.
Merge pull request #1 from L3viathan/master

Just a little cleaner