Removed redudant code. Made fetch/get method to reuse existing logic