removed comment lines and unreachable code