STY: Cleaner implementation