addressed all pull requests suggestions