Removed import warnings and some whitspace