remove svn, improve code