Little code adjustments