* Removed some commented code and extra white spaces