Clean up and user scaleable