Improve the code (remove unsual condition)