suggested changes made, thanks @miketheman and @clutchski for the feedback