kurtraschke Further formatting and cleanup throughout.