clened up code
Renamed function