Image.cpp -> image.cc, and also improved indentation.