Made code much more readable with a real naming convention...