add fixes for issues that was found in review