Make it compile
Tidy