commit - more refactor