[FEATURE REQUEST] Update code to use java 9+ features

[OpticFusion1]

Is your feature request related to a problem? Please describe.
Certain things can most likely be done better with java 9+ additions

Describe the solution you'd like
N/A

Describe alternatives you've considered
N/A

Additional context
N/A