Fixed comments of simon