Definitely some areas that should be improved, but those can be done in coordination with Makefile updates once a base spec file exists.