Moshe refactor riemann prefix feature

fix indentation and { so diff has minimal changes !