settings created, add datetime and clean code