Revert "Got rid of unnessecary stuff & did some code cleanup"

This reverts commit c6314905ae45b0361812ab4e89e187a65b4db2d4.