Readability update + slight bugfix in logic.