less stupid code (I guess) and more bugs :3