Less stinky code