removed comments and fixed typos