ref #15 beautification