[UPDATED] cleaned up file names &* comments