new aliases and fix whitespace