Incorporated hlint changes