Updated: cleaned up vim