Cleaned up blueprints