Clean up, script should work