SOCIALLI-23: Polish and formatting