Code maintainence and fix overflow issue.