STYLE: Fix trailing whitespace
ENH: Refactor parameters as key, value lists instead of objects