Small code tunning