Refactor bp to blueprint for readability