Clean up a bit, fix typing error and introducing MainSurfaceView in
build-properties