upd 2

some minor cleaning