Commit
1.2, more code cleaning