added improvements from comments