Refactor 9db62ec5d8d485c5a937d68e6028f57e764569c0