Code improvments 3