Code improvments 4