Updated DLL & code cleanup