removed commented code, fixed typos