Cleanup and Optimization

Cleaned up some links