name change
spacing
remove unused method