Fixed comments and removed id from compare