Fixed some indent and remove vim swaps