Move enum to related class
Privatize class
Remove uneeded using
Move class to it'