Code formatting and fix error