Doing some more code cleanup while thinking about the best way to add in
new functionality. Going through and fixing any warnings or adding
@suppress warning tags where they cannot be removed