Loader -> Code cleanup