Removed puncutation from error return
Updated comments
Updated comments