Remove default parameter, add comments