refactorings based on PR feedback 1