Remove redundant rescue
Fix inconsistent naming