finishing touches on thought/request refactoring