More Cleanup and Styling