Improve grading and overall style