making changes to pass lint

I had to grab this for a project I'm working on, and my OCD got the best of me on the lint errors.  I made the changes for myself, and am offering the changes should you want them.  If not, that's fine... I just wanted to share what I could, if I could.