Code cleanup
Removed bad import, added optprase