some aliases and removed weird line