Refactored the names of two classes, reduced the need to apply unused
suppression warning annotations and deleted some redundant code