Readded comments documenting what is being thrown
Renamed variables to comply with field naming conventions in the code styles