fixed warning, fixed typos, cleaned imports