Formatted code and cleaned up uneeded imports in all source