Project now compiles and formatting is fixed.

Review by @lidijaf