Identi file and do some refactoring in the cleanup alias