Cleanup and cosmetic changes