Styling Changes and Small Cleanup