[GH-489] Simplifying the changes