addressed comments from @ElBrogrammer