Refromated code