Fix comments + style