clean up code

git-svn-id: https://svn.sinaapp.com/testdrape/1@145 3aab84ea-45f4-4ca6-9053-3a61a15e3b4a