Some code and presentation cleanup