Item state is now kept during modification
CS fix & phpdoc