Getting rid of bad code, was doing a poor job of breaking these out