clean up for working copy..removing redundant comments, fix line char count