Made setDonCommand() private and cleaned code