Fix comments and short code