Cleanup

Fixme reverred to formatting of comments.
Fixed in 24260b389852ab109de6b62822d889d0e66ae723