after code's elegance improvement