Removed unreachable code
Tidying