[ Update ] Clean-up the code