Cleanup unnecessary links
Reformat
Missing links and defines