Tidying up blueprints