cleaner integration with existing code