//SOme code Cleanup and commenting