Little code improvements.