Bug fixes & code cleaning
Bug fixes & code cleaning