refactiring - first phase SUCCESS!