Removed unnecessary attribute names and console.log's