Comments Improvements