improved comments?