file cleaned up / sorted