removed unthrown catch
added some comments