This shouldnt exist here. Im also taking the opportunity to clean this up.