misc commenting and class layout