Code cleanup

Code cleanup for GraphCalc 3.3