Removed non-sense and just plain wrong if{}else{} blocks