Removed superfluous if/else