Cleanup and Polish for Preview of first pass at Angular build out