removed tooltip and cleaned up from rebase