further adjustments for code quality.