Loosen the needed minimal version
Refactor - Simplify formatting