fixed typos & removed accessive conditions