Some clean up done, also few comments added