clean code + added time on checkpoints