code syntax improvements