Commit of code improvements