cleanup code
cosmetic changes