Cleaned up parameters a little bit more.