Implemented all suggestions from @ediosyncratic. Thanks for the review