Code refinements and correct structure.