clean Tool Position commit

so .. my last try

dont get it cleaner.  take it or this was my last one :)