[UPDATE] Code styling