Tided up some of the lint warnings

Tidied up a majority of the lint warnings that the ADT listed.