Changes as suggested by @dceejay