STY: remove ### comments ###
STY: Reformatting more comments
STY: final fixes