Improve style and difficulty