STY: Slightly cleaner