Cleaned up file and noted issues with comments