Comments and Code Review

Made minor code changes and added comments