Unbunched some code