Commited the cleaned-up solution