Feature/cleanup

And also remove default values lines 18-21