Removed white line & spaces, Renamed function names, Fixed source indent.
I2: Removed white line & spaces, Renamed function names, Fixed source indent.