style cleanup + doxy comments