Commented code and removed unreachable code