Cleaning/refactoring of bunch of stacked/suffix/comment stuff (e.g.