Improve code formationg