Refactor parameter name per convention
Sort static fields
Update constructor to take wildcard class type
Update fields, constructor and #run conforming to step class convention