Clean code up.
Merge pull request #895 from monaka/pr-code-cleanup-20130226

Clean code up.