Apply suggestions from byorgey