svn refactored