Bit of consistency improvements / cleanup for you Bean