Optimize code for better level-5 score
Update files for level 6