Minors Improvement at the Code