Structure Cleanup of code