Refactory code

git-svn-id: svn://irodssvn.ucsd.edu/trunk@5680 ea137bd6-aa86-47b6-b90d-b101d9f19a90