Fix comments by moving them inlin