Improvements to Organize Functions