removes comments and fixes tooltips