Code cleaning
Code optimization: removing unchecked operations
Code optimization: removing unchecked operations