Fixed comments and removed useless code.