Cleaner implementation.