Add comments about alias
Better names
Fixes