Minor: Removing junk code and enhancing comments