Cleanup / refactoring

Also add some links