Code formatting
Fix code errors