Code style fixes, removed unneeded rescue