Major Revisions. Simplified code. Removed old methods.
Some code cleanup. Removes redundant null checks, if's, if-else's, etc. Removes unused methods. Adds override annotation to methods requiring it. Changes some naming a tiny bit. Organizes some imports. Likely more than just this but just forgotten.