Helper method for converting Strings to enums
Consistent usage of this in constructors
Consistent newlines on consecutive method calls
Removed unnecessary comments
Code style
Extracted complex logic from if statements to methods
Removed legacy code