Clean code, remove import, and bugfix.