Minor code cleanup based on valgrind analysis
2 files changed