Cleaned up vim stuff