Fixed comments and names