Cleanup/add defaults