Working on standalone and format all code