structure update for preventing warnings during import
fixing additional whitespace