Snapshot after markdown fixes and finishing touches
Remove definitions from main file
Looks good