Little code improvements