Testing
Refactoring refine.js
Refactoring refine.js
More cleanups