refactoring / tune-ups