Debug mode addition, organize import