#214 fixed #169 beautifying