Refactor push data parser into a class