addressed some comments from bros
addressed comments from @ElDeveloper, @ElBrogrammer, and @wasade - thanks for the input