[Ayanga] major style changes