Current Refactorings as of 6-11-2013