Working on a little re-factoring and optimization.