Clean up helper methods