Refactor and Clean the Junk