Removed unnecessary output, changed some others