Code/style cleanup