Cleaning up the blueprint view