Some cleaning + Vim package added