Making code prettier and less confusing in behavior