Fixes for formatting issues
Flesh out Prioritizing Performance Improvements