Removing unnecessary comments
Modifications to handle exceptions efficiently