Remove unreachable code & clean up slightly