removed some console.log's and changed int to Number