Comments added to various classes