Minor refactor of dotlink to remove a function dependency
Add whitespace to dotlink for great clarity
Change some variable names in dotlink
Remove a TBD from dotlink; the organization is just fine