Slight optimization