fixed typos & remove useless stuff