code cleanup, cosmetic changes