git cleanup, vim reformatting