Improve code formating