Make logic more visible as suggested by Ermal