Applied @javanna feedback