Clean up code duplication