Bug 846079 - cleanup / lint stuff

@rwaldron you want to review ? this is based on your comments... I didn't do everything.