Add aliaz to bashrc and refactoring