Removed unused imports
Modified visibility scope
Fixed formatting