improve namings better
delete unused code