Code re-format