fix indenting and dont use messenger library