Applied suggestions by Bryan Hughes