re-modification to improve readability