Added comments, changed names