@JakobOvrum I'll start working on cleaning up the lines you've pointed out, however new commits won't show up as this pull was closed. 

@jmdavis Perhaps consider reopening it? Discussion in the NG seems pretty positive.