Moving some duplicated code to a common base class Signed-off-by: Guthrie Adams <guthadam@amazon.com>