fixed minor refactoring issues