Fix lint issues
#79

an63 wants to merge ed into master

We do not currently have an analysis of these two commits