cleaned up files based on feedback