Commenting and code clean up