Improve commments