Removing unused classes
Making several class immutable
Turning public fields to private