Readablility fixes, eliminate old comments