Refactored a bit of bellows to remove some repetitive code