cleaned up structuring