Cleaned up the Structure