Fixes and reformatting of blueprints