Clean up, added defaults as a function