removed dead comments and updated exceptions