Fixed vim; reformatted