code improvements

#9