Code clean-up and removed difficulty display