Re-factoring to lower case