removed ; and made some parts a bit more xtendish
removed more ;