Cleanup to structure and misc changes