Removed use of else conditions.