code cleanup, tooltips