Smaller code improvements