Code formatting and class rename