more formatting problems, blame vim