Cleanup project

What about default args?