LS: Some minor cleanup/tweaks