reindent and rework with ->>
rework to get rid of the revolting closure
fuck that closure!