Cleanup + add comments

Fixme reverred to formatting of comments, which was done in
24260b389852ab109de6b62822d889d0e66ae723