Removed dead code, added other for clarity.