Added refactoring skeleton
Cleanup.