improvements

on code