testing alias + some more refactorings