Removed some redundant spaces.
Updated some constants name.
Removed unused parameters.