cleaning up
More Structuring