Cleans up structure and spelling