Code refinement :)