Improve code syntax