1) refactorings
2) added a simplified alias search for conditionally methods