Some cosmetics code changes