CLEANED UP STRUCTURE!