Some code clean up to exemplify project style.