Just some minor changes and removing some import statements...