Applied some suggestions