Cleaned up structure / deleted a bunch