Add another parameter, slight cleanup