Fix mistakes and name method better.