Cleaned up code and overflow issue
Removed comment