Tiny refactoring to this totally shitty code base
Version bump