minor - commenting, rename a varaible, change an exception message