Improve enumerable and formatable modules