Removed explicit returns tatements