structuring + clean up
clean up