fix variable name for consistency
fix single statement rescue and value assignment syntax