working on cleaning up a few more methods