Remove 3.5 and refine codes