Cleaned some classes up + added suppressWarnings