FIX: comments still to be fixed in style