few optimazations