cleaned code a little
cleaned code a little