Better Method naming, fix conditions