Removed unnecessary maps.
Edit comments and removed debugging codes