code formatting and class header name fixing