Minor Re-factoring to improve readability