Not ready for use
minor code cleaning