Use conditionals
Refactor and remove obsolete comment