cosmetics: some small comments moved