small restructuring
small restructuring