Use underscore in extras, cleanup code