CON-1813 beautified files