Code refactor

Btw, pop and push arent even being used