Removed unnecessary codes.
Cleaned up