Cleaning up and adding aliases