Clean up methods for clarity.