NOREF: Cleaning up some of the code after running lint