Replaced empty ifs to improve readability