Vehicle refactor 2014

Improper indendation here too.