comment + better consistant code