Some refactorings, fixed bug in traits (double '))'), added location to Use alias