Code improvements. No major activity