code syntax cleanup