Simplify conditional statement and make instance
variable final
Removing unused constructors
Instance variable can be final
Removing unused class