Trying to clear up redundant code and make easier to use for custom plotting scripts