Minor cleanup based on current functionality