Refactor: remove unnessary if-else;