bugfix & code cleaning