Refactoring - Sciweavers