Consolidation

I consolidated some of the methods in a way that there is less
repetition