Doing some cleanup! thanks @REV3NT3CH