Slightly more code cleanup