Minor code cleanup :lipstick: