Cleanup and reworking param inconsistencies.