Refactoring BIO: Small adjustments