MOD: code formatting