Reviewing code; minor formatting changes; changed class names for case-insensitive file systems