cleanup of code, still have to fill out some stubbing on Monday