code cleanup
Merge pull request #470 from nlake44/memcache-cleanup

code cleanup