Cleaned up solution for #33