code cleaning + update version number