some minor cleanups
Merge pull request #284 from monkeyiq/2013jan/cleanups1

some minor cleanups