Renamed internally used methodes
Removed duplicate statement inside the if