Cleaned and renamed solution