removed useless and commented else