Did some code cleaning to be able to read it in edit mode