refactoring / trash removed