refactoring trying to speed things up + removing svn branch information (yay!)