improvements as per peer reveiews