Refoemated code