Add refs and formatting