Refractor/Cleanup