refactorng: minor changes