Move comment into proper place