Deleted extra lines, changed methods