cleaned up linker