Improve Fetzer calculator