cleanup

start cleaning up the thumb core to optimize it some more.