cleaned code a bit
a bit more cleanup