Cleaning some stuff up

*Changed around some functions
*cleaned up the imports