re-align code to svn