Code cleanup, cosmetic changes