Some more logic cleanup