Cleaning up with 10up suggestions