remove unused function
Rename and reorganize member methods