Almost done cleaning out the code