Improve code fotmat