Cleanup and some new aliases