Finished fixing lint errors