Readability fix in base logic