cleanup some old comments and fixed some formatting