More comments and consistent naming