Fix class names, comments and clean lines